From db2440ed55278a5c89b4ed7407f12f5d943c4c49 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 2 Feb 2004 22:26:15 +0000 Subject: [PATCH] Set the cursor in all cases. If no grab cursor specified, use the grabbing 2004-02-02 Tor Lillqvist * gdk/win32/gdkevents-win32.c (gdk_pointer_grab): Set the cursor in all cases. If no grab cursor specified, use the grabbing window's cursor. If the grabbing window has no cursor, use the default arrow cursor. (#118025) --- ChangeLog | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-4 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ gdk/win32/gdkevents-win32.c | 5 +++++ 6 files changed, 40 insertions(+) diff --git a/ChangeLog b/ChangeLog index 3bcbbc1f2f..59d145c36a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2004-02-02 Tor Lillqvist + + * gdk/win32/gdkevents-win32.c (gdk_pointer_grab): Set the cursor + in all cases. If no grab cursor specified, use the grabbing + window's cursor. If the grabbing window has no cursor, use the + default arrow cursor. (#118025) + Mon Feb 2 22:05:36 2004 Matthias Clasen * gtk/gtkseparatormenuitem.c (gtk_separator_menu_item_init): The diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 3bcbbc1f2f..59d145c36a 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +2004-02-02 Tor Lillqvist + + * gdk/win32/gdkevents-win32.c (gdk_pointer_grab): Set the cursor + in all cases. If no grab cursor specified, use the grabbing + window's cursor. If the grabbing window has no cursor, use the + default arrow cursor. (#118025) + Mon Feb 2 22:05:36 2004 Matthias Clasen * gtk/gtkseparatormenuitem.c (gtk_separator_menu_item_init): The diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 3bcbbc1f2f..59d145c36a 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +2004-02-02 Tor Lillqvist + + * gdk/win32/gdkevents-win32.c (gdk_pointer_grab): Set the cursor + in all cases. If no grab cursor specified, use the grabbing + window's cursor. If the grabbing window has no cursor, use the + default arrow cursor. (#118025) + Mon Feb 2 22:05:36 2004 Matthias Clasen * gtk/gtkseparatormenuitem.c (gtk_separator_menu_item_init): The diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 3bcbbc1f2f..59d145c36a 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +2004-02-02 Tor Lillqvist + + * gdk/win32/gdkevents-win32.c (gdk_pointer_grab): Set the cursor + in all cases. If no grab cursor specified, use the grabbing + window's cursor. If the grabbing window has no cursor, use the + default arrow cursor. (#118025) + Mon Feb 2 22:05:36 2004 Matthias Clasen * gtk/gtkseparatormenuitem.c (gtk_separator_menu_item_init): The diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 3bcbbc1f2f..59d145c36a 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +2004-02-02 Tor Lillqvist + + * gdk/win32/gdkevents-win32.c (gdk_pointer_grab): Set the cursor + in all cases. If no grab cursor specified, use the grabbing + window's cursor. If the grabbing window has no cursor, use the + default arrow cursor. (#118025) + Mon Feb 2 22:05:36 2004 Matthias Clasen * gtk/gtkseparatormenuitem.c (gtk_separator_menu_item_init): The diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c index b0582110ad..bfa82da8f3 100644 --- a/gdk/win32/gdkevents-win32.c +++ b/gdk/win32/gdkevents-win32.c @@ -560,6 +560,7 @@ gdk_pointer_grab (GdkWindow *window, if (return_val == GDK_GRAB_SUCCESS) { + GdkWindowImplWin32 *impl = GDK_WINDOW_IMPL_WIN32 (((GdkWindowObject *) window)->impl); p_grab_window = window; if (p_grab_cursor != NULL) @@ -573,6 +574,10 @@ gdk_pointer_grab (GdkWindow *window, if (p_grab_cursor != NULL) SetCursor (p_grab_cursor); + else if (impl->hcursor != NULL) + SetCursor (impl->hcursor); + else + SetCursor (LoadCursor (NULL, IDC_ARROW)); if (confine_to != NULL) { -- 2.30.2